Fixed merge comflicts

fning