We are now back on track, correctly merged file