Fixed merge errors
FIX COMMIT MERGE ERRORS