web commit by joey: conflict and merge is done!