Bugs Fixed
Conflict fix