merges are working