Fixed Conflicts & Errors