Introduced promises
Fixed conflict
Fixed bugs related to the merge