Bug 14857 - file conflicts with alterator-users

Summary: file conflicts with alterator-users