trimming the fat
premerge
fixing merge conflict