Added merging comments