Commit laptop before pulling
Merge laptop changes