merged conflict on homescreen