Removed unnecessary defines
Resolved conflicts