Fixed small logic error
Fix merge conflicts