coder3101 Resolve conflicts with upstream