RT | removing the merge conflicts - missed out file