First submission for bug demonstration
Resolving conflicts