Fixing code and resolving conflicts #210