Conflict resolution: first draft.
Conflict resolution: first draft.

Still buggy: some features do not get pushed.

BjornFJohansson/giraffe,BjornFJohansson/giraffe,UndeadBlow/giraffe,addgene/giraffe,BjornFJohansson/giraffe,UndeadBlow/giraffe,addgene/giraffe,addgene/giraffe,BjornFJohansson/giraffe,addgene/giraffe,BjornFJohansson/giraffe