small changes
solved conflict