changes a to an where appropriate
fixed merge conflict
fixed merge conflicts