updated aers conficts in git
removed spaces