Don't be afraid to merge