fixing small discrepencies, merge conflict