Merge conflict safegaurd