Fixed catastrophe with permissions and commit merge issue