commit post merge chris