Final change fixing conflict from merge