Minimally working
Fixed conflict
Fixed invalid syntax caused by conflicts