Made it merge better