Drop downs added after resolving conflicts