Fixed merge errors, merged master