auto mereger. (I removed the auto merge option from project.properties) Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>