Added more inteligence for merge process in order to avoid silly merges.