Fixed merged conflicts :P