updates based on the merged git changes