New commit
From git hub
fixed merge