removed unused file
resolved conflicts