Suggest methods for avoiding merge conflicts