I HATE THIS MERGING