Cleaned some code
Fixed conflicts