all merges resolved and functions defined!