reverted to ff merges. removed git url shortcuts.