Remove the 3way merge files in bootstrap3 branch