delete merge conflict file
123123

123123
Merge branch 'master' into richard-test