finished merging and fixing conflicts