changed errors
solved merge conflicts