Fixed merge conflicts bugs