Added codeclimate
fixed merge conflicts