initial styling done
duplicate gem removed
merge conflict