fixed merge errors

removed merge related contents.