Same here - this can create merging challenges later on.