final working copy commited
conflict fix