save before merging master view controller