Singup
Fixed conflicts