Commit before merge
Merge with laptop