final commits before trying to merge