remove conflicting file from branch and master