Merging with Moez'z last pushed commit