Hopefully resolving a stupid conflict...