minor edits
fixed conflict
fixed project gallery