to prevent merge conflicts