remove unecessary file
resolved conflicts