Conflictfree Bugfix and Lighting merge