fixed permissions issue
merged conflicts