Reverted conflicts and added latest version of the extension