resolve mergeconflicts
just to be sure commit resource again