fix messed up src from merge conflict