Fixed merge errors introduced by someone elses previous commit