Forcing merge conflicts
Fixed merged conflicts
Take mine