some merging issues resolved