Pretty useless commit
Fixed merged conflicts